diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-12-02 00:39:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-02 00:39:38 +0100 |
| commit | e9a43bae6f80e3c650f379a00372547648247536 (patch) | |
| tree | 4f3656ec2d766f4fca81143704031a6dfc987c7a | |
| parent | Merge pull request #12243 from zhaobot/tx-update-20231201021513 (diff) | |
| parent | service: nfc: Don't tag amiibos as corrupted if they are loaded as read only (diff) | |
| download | yuzu-e9a43bae6f80e3c650f379a00372547648247536.tar yuzu-e9a43bae6f80e3c650f379a00372547648247536.tar.gz yuzu-e9a43bae6f80e3c650f379a00372547648247536.tar.bz2 yuzu-e9a43bae6f80e3c650f379a00372547648247536.tar.lz yuzu-e9a43bae6f80e3c650f379a00372547648247536.tar.xz yuzu-e9a43bae6f80e3c650f379a00372547648247536.tar.zst yuzu-e9a43bae6f80e3c650f379a00372547648247536.zip | |
| -rw-r--r-- | src/core/hle/service/nfc/common/device.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp index 47516f883..f97e5b44c 100644 --- a/src/core/hle/service/nfc/common/device.cpp +++ b/src/core/hle/service/nfc/common/device.cpp @@ -438,16 +438,16 @@ Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target is_corrupted = true; } - if (!is_corrupted) { + device_state = DeviceState::TagMounted; + mount_target = mount_target_; + + if (!is_corrupted && mount_target != NFP::MountTarget::Rom) { std::vector<u8> data(sizeof(NFP::EncryptedNTAG215File)); memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data)); WriteBackupData(encrypted_tag_data.uuid, data); } - device_state = DeviceState::TagMounted; - mount_target = mount_target_; - - if (is_corrupted) { + if (is_corrupted && mount_target != NFP::MountTarget::Rom) { bool has_backup = HasBackup(encrypted_tag_data.uuid).IsSuccess(); return has_backup ? ResultCorruptedDataWithBackup : ResultCorruptedData; } |